From 278582d61d10411cde26fff4d4bd1df8528df832 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 14 May 2002 16:48:31 +0000 Subject: [PATCH] Discard configure events from SubstructureNotify. (#81760, Rich Burridge) Tue May 14 11:21:19 2002 Owen Taylor * gdk/x11/gdkevents-x11.c (gdk_event_translate): Discard configure events from SubstructureNotify. (#81760, Rich Burridge) * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not strcmp(). * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp width of child allocation to >= 1. (Fixes warnings from #77639, Martin Schulze) --- ChangeLog | 13 +++++++++++++ ChangeLog.pre-2-10 | 13 +++++++++++++ ChangeLog.pre-2-2 | 13 +++++++++++++ ChangeLog.pre-2-4 | 13 +++++++++++++ ChangeLog.pre-2-6 | 13 +++++++++++++ ChangeLog.pre-2-8 | 13 +++++++++++++ gdk/x11/gdkevents-x11.c | 4 ++++ gtk/gtkfontsel.c | 2 +- gtk/gtkmenuitem.c | 3 +++ 9 files changed, 86 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 19e9ebef4b..70955ff434 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +Tue May 14 11:21:19 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): + Discard configure events from SubstructureNotify. + (#81760, Rich Burridge) + + * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not + strcmp(). + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp + width of child allocation to >= 1. (Fixes warnings from + #77639, Martin Schulze) + 2002-05-14 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_class_install_child_property): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 19e9ebef4b..70955ff434 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,16 @@ +Tue May 14 11:21:19 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): + Discard configure events from SubstructureNotify. + (#81760, Rich Burridge) + + * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not + strcmp(). + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp + width of child allocation to >= 1. (Fixes warnings from + #77639, Martin Schulze) + 2002-05-14 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_class_install_child_property): diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 19e9ebef4b..70955ff434 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,16 @@ +Tue May 14 11:21:19 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): + Discard configure events from SubstructureNotify. + (#81760, Rich Burridge) + + * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not + strcmp(). + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp + width of child allocation to >= 1. (Fixes warnings from + #77639, Martin Schulze) + 2002-05-14 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_class_install_child_property): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 19e9ebef4b..70955ff434 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,16 @@ +Tue May 14 11:21:19 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): + Discard configure events from SubstructureNotify. + (#81760, Rich Burridge) + + * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not + strcmp(). + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp + width of child allocation to >= 1. (Fixes warnings from + #77639, Martin Schulze) + 2002-05-14 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_class_install_child_property): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 19e9ebef4b..70955ff434 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,16 @@ +Tue May 14 11:21:19 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): + Discard configure events from SubstructureNotify. + (#81760, Rich Burridge) + + * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not + strcmp(). + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp + width of child allocation to >= 1. (Fixes warnings from + #77639, Martin Schulze) + 2002-05-14 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_class_install_child_property): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 19e9ebef4b..70955ff434 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,16 @@ +Tue May 14 11:21:19 2002 Owen Taylor + + * gdk/x11/gdkevents-x11.c (gdk_event_translate): + Discard configure events from SubstructureNotify. + (#81760, Rich Burridge) + + * gtk/gtkfontsel.c (cmp_families): Use g_utf8_strcoll(), not + strcmp(). + + * gtk/gtkmenuitem.c (gtk_menu_item_size_allocate): Clamp + width of child allocation to >= 1. (Fixes warnings from + #77639, Martin Schulze) + 2002-05-14 Matthias Clasen * gtk/gtkcontainer.c (gtk_container_class_install_child_property): diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c index 181b9fea1d..04a671bee4 100644 --- a/gdk/x11/gdkevents-x11.c +++ b/gdk/x11/gdkevents-x11.c @@ -1382,13 +1382,17 @@ gdk_event_translate (GdkDisplay *display, ? " (discarding)" : GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD ? " (discarding child)" + : xevent->xconfigure.event != xevent->xconfigure.window + ? " (discarding substructure)" : "")); if (window && + xevent->xconfigure.event == xevent->xconfigure.window && !GDK_WINDOW_DESTROYED (window) && (window_private->extension_events != 0)) _gdk_input_configure_event (&xevent->xconfigure, window); if (!window || + xevent->xconfigure.event != xevent->xconfigure.window || GDK_WINDOW_TYPE (window) == GDK_WINDOW_CHILD || GDK_WINDOW_TYPE (window) == GDK_WINDOW_ROOT) return_val = FALSE; diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c index f46e2ccb26..19d4b74816 100644 --- a/gtk/gtkfontsel.c +++ b/gtk/gtkfontsel.c @@ -670,7 +670,7 @@ cmp_families (const void *a, const void *b) const char *a_name = pango_font_family_get_name (*(PangoFontFamily **)a); const char *b_name = pango_font_family_get_name (*(PangoFontFamily **)b); - return strcmp (a_name, b_name); + return g_utf8_collate (a_name, b_name); } static void diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c index ec34f441bf..118e7009ba 100644 --- a/gtk/gtkmenuitem.c +++ b/gtk/gtkmenuitem.c @@ -515,6 +515,9 @@ gtk_menu_item_size_allocate (GtkWidget *widget, if (menu_item->submenu && menu_item->show_submenu_indicator) child_allocation.width -= child_requisition.height; + if (child_allocation.width < 1) + child_allocation.width = 1; + gtk_widget_size_allocate (bin->child, &child_allocation); } -- 2.30.2